bitkeeper revision 1.1713.4.1 (42b896ce_iXHcZjWxYV17vzV3fQhTA)

Adapt to recent patches in common

diff --git a/.rootkeys b/.rootkeys
index e8834f68617c4e7149670e9e5b4e7ab621f50b58..a134ac2d9908f7c53a1d41b5b719b9ca1797bbe3 100644 (file)
--- a/.rootkeys
+++ b/.rootkeys
@@ -1374,6 +1374,7 @@
 421098b7Z6OwjZnrTZkh34DoDfcjrA xen/include/asm-ia64/regionreg.h
 421098b707cY5YluUcWK5Pc-71ETVw xen/include/asm-ia64/regs.h
 4214e2f3fbO_n9Z1kIcBR83d7W4OJw xen/include/asm-ia64/serial.h
+42b89683nnFDAElJewfm2JxG-pv1BQ xen/include/asm-ia64/shadow.h
 429fb3bc53qJOyKJCBfhDNmTasj8Gw xen/include/asm-ia64/slab.h
 421098b7GkWOnlzSmPvNAhByOSZ1Dw xen/include/asm-ia64/time.h
 421098b7FK3xgShpnH0I0Ou3O4fJ2Q xen/include/asm-ia64/tlb.h

diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
index 9df0d907aaff056de3dab511229ff61458608886..e64246d418522c3cb4fd8fe31eda6c4520e85540 100644 (file)
--- a/xen/include/asm-ia64/config.h
+++ b/xen/include/asm-ia64/config.h
@@ -103,6 +103,9 @@ extern char _end[]; /* standard ELF symbol */
 #define        get_cpu()       0
 #define put_cpu()      do {} while(0)
 
+// needed for common/dom0_ops.c until hyperthreading is supported
+#define smp_num_siblings 1
+
 // from linux/include/linux/mm.h
 struct page;
 

diff --git a/xen/include/asm-ia64/shadow.h b/xen/include/asm-ia64/shadow.h
new file mode 100644 (file)
index 0000000..40a8c17
--- /dev/null
+++ b/xen/include/asm-ia64/shadow.h
@@ -0,0 +1 @@
+/* empty */